*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a88010753b2f993fe6863bea0bbd9b7c38a05b1..21a3158a3c27f07f6552cf1ac7aed294154237d9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,6 @@
 2008-02-11 Drew Adams  <drew.adams@oracle.com>
 
-       * isearch.el:
-       (isearch-fail): New face.
+       * isearch.el (isearch-fail): New face.
        (isearch-message): Highlight failure part of input.
 
 2008-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -55,7 +54,6 @@
 
        * calendar/time-date.el (emacs-uptime): New function.
 
->>>>>>> 1.12767
 2008-02-10  Bastien Guerry  <bzg@altern.org>
 
        * mail/rmail.el (rmail-nonignored-headers): Allow to be nil.